package com.itheima;

public class HelloGit {
  public static void main(String[] args) {
    System.out.println("========Hello Git========");
1231231231231231231231231231231231231231231231231
	System.out.println("test the conflict");

		Sysout???
	System.out.println("hello i am modifing you");
  }
}
